From: Colin Walters <walters@verbum.org>
Date: Mon, 30 Jun 2025 19:36:32 +0000 (-0400)
Subject: sysroot: Remove now-spurious assertion change from soft reboot changes
X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2~4^2~8^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=748bc65504f9cb64efa073ecad83548036dd021a;p=ostree.git

sysroot: Remove now-spurious assertion change from soft reboot changes

We fixed the bug that caused soft reboot to trip the assertion
here, so revert back to a hard check.
---

diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index f9955ce2..4cf388bc 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -1140,18 +1140,7 @@ _ostree_sysroot_reload_staged (OstreeSysroot *self, GError **error)
   if (!self->root_is_ostree_booted)
     return TRUE; /* Note early return */
 
-  /* In normal cases, we should have a booted deployment. However, during
-   * soft-reboot scenarios, the current deployment may not correspond to
-   * any bootloader entry, so booted_deployment could be NULL. */
-  if (!self->booted_deployment)
-    {
-      /* Check if we're in a soft-reboot scenario */
-      if (!(g_file_test ("/run/nextroot", G_FILE_TEST_IS_DIR)
-            && g_file_test ("/run/nextroot/sysroot", G_FILE_TEST_IS_DIR)))
-        {
-          g_assert (self->booted_deployment);
-        }
-    }
+  g_assert (self->booted_deployment);
 
   g_clear_object (&self->staged_deployment);
   g_clear_pointer (&self->staged_deployment_data, g_variant_unref);